projects / cargo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 44c0d7b b24bf7e)
Auto merge of #2196 - matklad:metadata2, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 25 Jan 2016 17:56:00 +0000 (17:56 +0000)
committerbors <bors@rust-lang.org>
Mon, 25 Jan 2016 17:56:00 +0000 (17:56 +0000)
commit859c5d3c6401db45141147e6cb2482f6fa992628
tree4a56b311d162aafa42506cd3623b5b5eff70b952tree | snapshot
parent44c0d7b78548c83b6df4935fdbb15be62f30d685commit | diff
parentb24bf7e6a42027b140eb136a336b3444d879658ccommit | diff
Auto merge of #2196 - matklad:metadata2, r=alexcrichton

Most of the work was done by @dan-t in #1225 and by @winger in #1434

Fixes #2193

I failed to properly rebase previous attempts so I just salvaged this from bits and pieces.

@alexcrichton are you sure that the default format should be TOML? I think that TOML is more suitable for humans, and JSON is better (at the moment at least) for tools. Maybe we should default to ~~TOML~~ JSON?
src/bin/cargo.rs diff1 | diff2 | blob | history
tests/tests.rs diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.